in RTL mode, position the title lable next to the arrow just as we do for

2004-05-06  Sven Neumann  <sven@gimp.org>

	* gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
	position the title lable next to the arrow just as we do for LTR
	rendering. Fixes bug #141825.

diff --git a/ChangeLog b/ChangeLog
index c7844d5ab7aec8fe52536f929a6b4258f573aa4a..19f858a2be2328d1a5e3c98979aa9a698fb2d5cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-06  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
+       position the title lable next to the arrow just as we do for LTR
+       rendering. Fixes bug #141825.
+
 2004-05-06  Matthias Clasen  <mclasen@redhat.com>
 
        * docs/RELEASE-HOWTO: Document the new policy of

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7844d5ab7aec8fe52536f929a6b4258f573aa4a..19f858a2be2328d1a5e3c98979aa9a698fb2d5cd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-05-06  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
+       position the title lable next to the arrow just as we do for LTR
+       rendering. Fixes bug #141825.
+
 2004-05-06  Matthias Clasen  <mclasen@redhat.com>
 
        * docs/RELEASE-HOWTO: Document the new policy of

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c7844d5ab7aec8fe52536f929a6b4258f573aa4a..19f858a2be2328d1a5e3c98979aa9a698fb2d5cd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-05-06  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
+       position the title lable next to the arrow just as we do for LTR
+       rendering. Fixes bug #141825.
+
 2004-05-06  Matthias Clasen  <mclasen@redhat.com>
 
        * docs/RELEASE-HOWTO: Document the new policy of

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7844d5ab7aec8fe52536f929a6b4258f573aa4a..19f858a2be2328d1a5e3c98979aa9a698fb2d5cd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-05-06  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkexpander.c (gtk_expander_size_allocate): in RTL mode,
+       position the title lable next to the arrow just as we do for LTR
+       rendering. Fixes bug #141825.
+
 2004-05-06  Matthias Clasen  <mclasen@redhat.com>
 
        * docs/RELEASE-HOWTO: Document the new policy of

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index eace48f0198f8846682f44325faa17527c0c2aa8..7deb7bbe9efbd0d6e7adbf61096494afbad0231a 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -614,9 +614,16 @@ gtk_expander_size_allocate (GtkWidget     *widget,
 
       ltr = gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL;
 
-      label_allocation.x = widget->allocation.x + border_width + focus_width + focus_pad;
       if (ltr)
-       label_allocation.x += expander_size + 2 * expander_spacing;
+       label_allocation.x = (widget->allocation.x +
+                              border_width + focus_width + focus_pad +
+                              expander_size + 2 * expander_spacing);
+      else
+        label_allocation.x = (widget->allocation.x + widget->allocation.width -
+                              (label_requisition.width +
+                               border_width + focus_width + focus_pad +
+                               expander_size + 2 * expander_spacing));
+
       label_allocation.y = widget->allocation.y + border_width + focus_width + focus_pad;
 
       label_allocation.width = MIN (label_requisition.width,